Resolve Github Conflicts